piggy bug fixes